[IA64] Move console_start_sync() in INIT path
authorawilliam@xenbuild.aw <awilliam@xenbuild.aw>
Tue, 24 Oct 2006 15:22:56 +0000 (09:22 -0600)
committerawilliam@xenbuild.aw <awilliam@xenbuild.aw>
Tue, 24 Oct 2006 15:22:56 +0000 (09:22 -0600)
This patch moves console_start_sync() before first message in
ia64_init_handler(), and it cleans up ia64_init_handler().

Signed-off-by: Masaki Kanno <kanno.masaki@jp.fujitsu.com>
xen/arch/ia64/linux-xen/mca.c

index 30803dacedddfeeae11c64b2623c95fbc2339ba7..64151f3a4e0fafa7f67de25ba83112ac61495009 100644 (file)
@@ -1220,12 +1220,6 @@ void
 ia64_init_handler (struct pt_regs *pt, struct switch_stack *sw)
 {
        pal_min_state_area_t *ms;
-#ifdef XEN
-       int cpu = smp_processor_id();
-
-       printk(KERN_INFO "Entered OS INIT handler. PSP=%lx\n",
-              ia64_sal_to_os_handoff_state[cpu].proc_state_param);
-#endif
 
 #ifndef XEN
        oops_in_progress = 1;   /* avoid deadlock in printk, but it makes recovery dodgy */
@@ -1241,7 +1235,12 @@ ia64_init_handler (struct pt_regs *pt, struct switch_stack *sw)
         */
        ms = (pal_min_state_area_t *)(ia64_sal_to_os_handoff_state.pal_min_state | (6ul<<61));
 #else
+       int cpu = smp_processor_id();
+
        console_start_sync();
+       printk(KERN_INFO "Entered OS INIT handler. PSP=%lx\n",
+              ia64_sal_to_os_handoff_state[cpu].proc_state_param);
+
        /* Xen virtual address in region 7. */
        ms = __va((pal_min_state_area_t *)(ia64_sal_to_os_handoff_state[cpu].pal_min_state));
 #endif